[SOLARIS] Fix xentop build.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/tools/xenstat/xentop/Makefile b/tools/xenstat/xentop/Makefile
index 2248bfb3c31dcc9195ed2b8a308fe06fc0c4f587..5f85d732e6ec77262168e9e9e577c42b3335e1e0 100644 (file)
--- a/tools/xenstat/xentop/Makefile
+++ b/tools/xenstat/xentop/Makefile
@@ -26,6 +26,7 @@ sbindir=$(prefix)/sbin
 CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT)
 LDFLAGS += -L$(XEN_LIBXENSTAT)
 LDLIBS += -lxenstat $(CURSES_LIBS) $(SOCKET_LIBS)
+CFLAGS += -DHOST_$(XEN_OS)
 
 .PHONY: all
 all: xentop

diff --git a/tools/xenstat/xentop/xentop.c b/tools/xenstat/xentop/xentop.c
index a2ea23a735ce9758a7b9d9cd28fe47c36191ecdb..4b610c3668b0025ca9dbcbc5f1a9d09707047bcd 100644 (file)
--- a/tools/xenstat/xentop/xentop.c
+++ b/tools/xenstat/xentop/xentop.c
@@ -49,6 +49,13 @@
 
 #define KEY_ESCAPE '\x1B'
 
+#ifdef HOST_SunOS
+/* Old curses library on Solaris takes non-const strings. */
+#define curses_str_t char *
+#else
+#define curses_str_t const char *
+#endif
+
 /*
  * Function prototypes
  */
@@ -269,7 +276,7 @@ static void print(const char *fmt, ...)
        if (!batch) {
                if((current_row() < lines()-1)) {
                        va_start(args, fmt);
-                       vwprintw(stdscr, fmt, args);
+                       vwprintw(stdscr, (curses_str_t)fmt, args);
                        va_end(args);
                }
        } else {
@@ -283,7 +290,7 @@ static void print(const char *fmt, ...)
 static void attr_addstr(int attr, const char *str)
 {
        attron(attr);
-       addstr(str);
+       addstr((curses_str_t)str);
        attroff(attr);
 }